chore: add SOPS KMS recipient and GitHub OIDC role#6
Merged
Conversation
6357211 to
de42a2e
Compare
OpenTofu Plan |
xnoto
added a commit
to makeitworkcloud/shared-workflows
that referenced
this pull request
Jun 19, 2026
## Summary - configure the reusable OpenTofu workflow to assume the SOPS KMS IAM role via GitHub OIDC - add `id-token: write` permission to the reusable workflow - make `SOPS_AGE_KEY` optional while age remains as a fallback recipient - document the OIDC role inputs and caller requirements ## Dependency - Requires `makeitworkcloud/tfroot-aws#6` to be merged/applied first so `arn:aws:iam::332355796717:role/github-actions-sops-kms` exists. ## Validation - `pre-commit run --all-files`
xnoto
added a commit
to makeitworkcloud/tfroot-github
that referenced
this pull request
Jun 19, 2026
## Summary - add the Make IT Work Cloud SOPS AWS KMS key as the SOPS recipient - remove the age recipient from `.sops.yaml` - re-key `secrets/secrets.yaml` so SOPS metadata is KMS-only - grant the caller workflow `id-token: write` for the shared workflow's GitHub OIDC role assumption - stop publishing `SOPS_AGE_KEY` as a GitHub Actions secret to tfroot repositories - remove the encrypted `sops_age_key` value from this repo's SOPS secrets file ## Dependency / rollout - Requires `makeitworkcloud/tfroot-aws#6` and `makeitworkcloud/shared-workflows#7`, both now merged/applied. - Applying this PR will remove managed `SOPS_AGE_KEY` GitHub Actions secrets from the tfroot repositories. ## Validation - `AWS_PROFILE=makeitwork sops decrypt --output /dev/null secrets/secrets.yaml` - verified SOPS metadata has `kms=1` and `age=0` - verified no remaining `SOPS_AGE_KEY` / `sops_age_key` references - `PCT_TFPATH=$(command -v tofu) pre-commit run --all-files`
xnoto
added a commit
to makeitworkcloud/tfroot-libvirt
that referenced
this pull request
Jun 19, 2026
## Summary - add the Make IT Work Cloud SOPS AWS KMS key as the SOPS recipient - remove the age recipient from `.sops.yaml` - re-key `secrets/secrets.yaml` so SOPS metadata is KMS-only - grant the caller workflow `id-token: write` for the shared workflow's GitHub OIDC role assumption ## Dependency / rollout - Requires `makeitworkcloud/tfroot-aws#6` and `makeitworkcloud/shared-workflows#7`, both now merged/applied. ## Validation - `AWS_PROFILE=makeitwork sops decrypt --output /dev/null secrets/secrets.yaml` - verified SOPS metadata has `kms=1` and `age=0` - `PCT_TFPATH=$(command -v tofu) pre-commit run --all-files`
xnoto
added a commit
to makeitworkcloud/tfroot-cloudflare
that referenced
this pull request
Jun 19, 2026
## Summary - add the Make IT Work Cloud SOPS AWS KMS key as the SOPS recipient - remove the age recipient from `.sops.yaml` - re-key `secrets/secrets.yaml` so SOPS metadata is KMS-only - grant the caller workflow `id-token: write` for the shared workflow's GitHub OIDC role assumption - stop passing `SOPS_AGE_KEY` to the shared workflow ## Dependency / rollout - Requires `makeitworkcloud/tfroot-aws#6` and `makeitworkcloud/shared-workflows#7`, both now merged/applied. - `makeitworkcloud/shared-workflows#8` removes the age secret from the reusable workflow itself. ## Validation - `AWS_PROFILE=makeitwork sops decrypt --output /dev/null secrets/secrets.yaml` - verified SOPS metadata has `kms=1` and `age=0` - `PCT_TFPATH=$(command -v tofu) pre-commit run --all-files`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
secrets/secrets.yamlwhile keeping the existing age recipient for compatibilitygithub-actions-sops-kmsIAM role for CI SOPS KMS accessid-token: writeDependency / rollout
makeitworkcloud/shared-workflows#7, because the reusable workflow assumes the role created here.Validation
AWS_PROFILE=makeitwork sops decrypt --output /dev/null secrets/secrets.yamltofu init -backend=false -input=false -no-colortofu validate -no-colorPCT_TFPATH=$(command -v tofu) pre-commit run --all-files